gtk/demos/gtk-demo/*: Remove all uses of deprecated functions.

diff --git a/ChangeLog b/ChangeLog
index 7e9dad89691610e245de6e055ac4bff7790e1eb6..3d8d54ab9193d4b2bfcfef48a24120fb4f5fe201 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-08-17  Matthias Clasen  <matthiasc@waldgeist.poet.de>
+
+       * gtk/demos/gtk-demo/*: Remove all uses of deprecated functions.
+
 2001-08-17  Anders Carlsson  <andersca@gnu.org>
 
        * gtk/gtkstyle.c (create_expander_affine): Divide with floating

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 7e9dad89691610e245de6e055ac4bff7790e1eb6..3d8d54ab9193d4b2bfcfef48a24120fb4f5fe201 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,7 @@
+2001-08-17  Matthias Clasen  <matthiasc@waldgeist.poet.de>
+
+       * gtk/demos/gtk-demo/*: Remove all uses of deprecated functions.
+
 2001-08-17  Anders Carlsson  <andersca@gnu.org>
 
        * gtk/gtkstyle.c (create_expander_affine): Divide with floating

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 7e9dad89691610e245de6e055ac4bff7790e1eb6..3d8d54ab9193d4b2bfcfef48a24120fb4f5fe201 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+2001-08-17  Matthias Clasen  <matthiasc@waldgeist.poet.de>
+
+       * gtk/demos/gtk-demo/*: Remove all uses of deprecated functions.
+
 2001-08-17  Anders Carlsson  <andersca@gnu.org>
 
        * gtk/gtkstyle.c (create_expander_affine): Divide with floating

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 7e9dad89691610e245de6e055ac4bff7790e1eb6..3d8d54ab9193d4b2bfcfef48a24120fb4f5fe201 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,7 @@
+2001-08-17  Matthias Clasen  <matthiasc@waldgeist.poet.de>
+
+       * gtk/demos/gtk-demo/*: Remove all uses of deprecated functions.
+
 2001-08-17  Anders Carlsson  <andersca@gnu.org>
 
        * gtk/gtkstyle.c (create_expander_affine): Divide with floating

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 7e9dad89691610e245de6e055ac4bff7790e1eb6..3d8d54ab9193d4b2bfcfef48a24120fb4f5fe201 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,7 @@
+2001-08-17  Matthias Clasen  <matthiasc@waldgeist.poet.de>
+
+       * gtk/demos/gtk-demo/*: Remove all uses of deprecated functions.
+
 2001-08-17  Anders Carlsson  <andersca@gnu.org>
 
        * gtk/gtkstyle.c (create_expander_affine): Divide with floating

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 7e9dad89691610e245de6e055ac4bff7790e1eb6..3d8d54ab9193d4b2bfcfef48a24120fb4f5fe201 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,7 @@
+2001-08-17  Matthias Clasen  <matthiasc@waldgeist.poet.de>
+
+       * gtk/demos/gtk-demo/*: Remove all uses of deprecated functions.
+
 2001-08-17  Anders Carlsson  <andersca@gnu.org>
 
        * gtk/gtkstyle.c (create_expander_affine): Divide with floating

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 7e9dad89691610e245de6e055ac4bff7790e1eb6..3d8d54ab9193d4b2bfcfef48a24120fb4f5fe201 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,7 @@
+2001-08-17  Matthias Clasen  <matthiasc@waldgeist.poet.de>
+
+       * gtk/demos/gtk-demo/*: Remove all uses of deprecated functions.
+
 2001-08-17  Anders Carlsson  <andersca@gnu.org>
 
        * gtk/gtkstyle.c (create_expander_affine): Divide with floating

diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am
index 0cfcbd76fad128e3629b2ef066aca85a76ba3c17..64b821d3316fb81f3d852847a3973596f5729d6f 100644 (file)
--- a/demos/gtk-demo/Makefile.am
+++ b/demos/gtk-demo/Makefile.am
@@ -24,6 +24,7 @@ INCLUDES = @STRIP_BEGIN@ \
        -DDEMOCODEDIR="\"$(democodedir)\""              \
        -I$(top_srcdir)                                 \
        -I$(top_builddir)/gdk                           \
+       -DG_DISABLE_DEPRECATED                          \
        -DGDK_DISABLE_COMPAT_H                          \
        -DGDK_DISABLE_DEPRECATED                        \
        -DGTK_DISABLE_COMPAT_H                          \

diff --git a/demos/gtk-demo/drawingarea.c b/demos/gtk-demo/drawingarea.c
index 967cc0525e3dc90ccbd81f1ac6c446906d19239d..007c191d2f99dbc6ef672b55f9aae0dff5687444 100644 (file)
--- a/demos/gtk-demo/drawingarea.c
+++ b/demos/gtk-demo/drawingarea.c
@@ -254,7 +254,7 @@ do_drawingarea (void)
       
       da = gtk_drawing_area_new ();
       /* set a minimum size */
-      gtk_widget_set_usize (da, 100, 100);
+      gtk_widget_set_size_request (da, 100, 100);
 
       gtk_container_add (GTK_CONTAINER (frame), da);
 
@@ -278,7 +278,7 @@ do_drawingarea (void)
       
       da = gtk_drawing_area_new ();
       /* set a minimum size */
-      gtk_widget_set_usize (da, 100, 100);
+      gtk_widget_set_size_request (da, 100, 100);
 
       gtk_container_add (GTK_CONTAINER (frame), da);
 

diff --git a/demos/gtk-demo/menus.c b/demos/gtk-demo/menus.c
index 8411eabbe192ff90ab0138285a398075cc9f66ec..16688f09d5d72c1fc89c0f48642ba61b43a59b10 100644 (file)
--- a/demos/gtk-demo/menus.c
+++ b/demos/gtk-demo/menus.c
@@ -60,7 +60,7 @@ create_menu (gint     depth,
     {
       sprintf (buf, "item %2d - %d", depth, j);
       menuitem = gtk_radio_menu_item_new_with_label (group, buf);
-      group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (menuitem));
+      group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menuitem));
 
       gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
       gtk_widget_show (menuitem);

diff --git a/demos/gtk-demo/panes.c b/demos/gtk-demo/panes.c
index 3e1032976203bc5d28aafc4aed519525f4ee3e83..86d11c03da3e53c4bae74797aff990b2b7c8a32d 100644 (file)
--- a/demos/gtk-demo/panes.c
+++ b/demos/gtk-demo/panes.c
@@ -156,12 +156,12 @@ do_panes (void)
 
       frame = gtk_frame_new (NULL);
       gtk_frame_set_shadow_type (GTK_FRAME(frame), GTK_SHADOW_IN);
-      gtk_widget_set_usize (frame, 80, 60);
+      gtk_widget_set_size_request (frame, 80, 60);
       gtk_paned_add2 (GTK_PANED (hpaned), frame);
 
       frame = gtk_frame_new (NULL);
       gtk_frame_set_shadow_type (GTK_FRAME(frame), GTK_SHADOW_IN);
-      gtk_widget_set_usize (frame, 60, 80);
+      gtk_widget_set_size_request (frame, 60, 80);
       gtk_paned_add2 (GTK_PANED (vpaned), frame);
 
       /* Now create toggle buttons to control sizing */

diff --git a/demos/gtk-demo/stock_browser.c b/demos/gtk-demo/stock_browser.c
index b5966b088c31ae39ad54fddffc274b51987bfa7d..ac884964a7fe32beeacfd362ced93a113163829e 100644 (file)
--- a/demos/gtk-demo/stock_browser.c
+++ b/demos/gtk-demo/stock_browser.c
@@ -122,7 +122,7 @@ id_to_macro (const gchar *id)
       ++p;
     }
 
-  g_strup (macro->str);
+  g_ascii_strup (macro->str);
   
   return g_string_free (macro, FALSE);
 }